Change in openvpn[master]: Http-proxy: Fix bug preventing proxy credentials caching.
A message that is not in the archive (sent off-list or not yet received): gerrit.1707991289000.Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to review the following change.
Change subject: Http-proxy: Fix bug preventing proxy credentials caching.
......................................................................
Http-proxy: Fix bug preventing proxy credentials caching.
Previously, the caching of proxy credentials was not working due to the missing of handling already defined creds in get_user_pass_http(), which prevented the caching from working correctly.
This issue has been solved by rewriting the get_user_pass_http(). This method now sets the appropriate flags based on whether credentials are defined, have been queried before, or are inline. It then calls the get_user_pass() to retrieve the credentials and store them in a static variable, 'static_proxy_user_pass', which will be used for subsequent requests. If credentials were not previously defined, or caching is not allowed, creds are queried again.
---
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
3 files changed, 31 insertions(+), 27 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/1
src/openvpn/options.c +2 -0
@@ -1858,6 +1858,7 @@SHOW_BOOL (persist_local_ip);SHOW_BOOL (persist_remote_ip);SHOW_BOOL (persist_key); +SHOW_BOOL (ce.http_proxy_options->nocache);#if PASSTOS_CAPABILITY SHOW_BOOL (passtos);
@@ -8978,6 +8979,7 @@ {VERIFY_PERMISSION (OPT_P_GENERAL );ssl_set_auth_nocache (); + options->ce.http_proxy_options->nocache = true; } else if (streq(p[0], "auth-token") && p[1] && !p[2]) {
src/openvpn/proxy.c +28 -27
82 lines not on this page · raw message
src/openvpn/proxy.h +1 -0
@@ -57,6 +57,7 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool nocache; };struct http_proxy_options_simple {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: Fix bug preventing proxy credentials caching.
......................................................................
Patch Set 1: Code-Review-2
(5 comments)
Patchset:
PS1:
Definitely has issues
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/a2ced5bd_47c89245 :
PS1, Line 1861: SHOW_BOOL(ce.http_proxy_options->nocache);
This belongs into show_connection_entry like the other o->ce options
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/99f3b845_b241aa5b :
PS1, Line 275: if (!static_proxy_user_pass.defined || (is_first_time && !p->options.nocache) )
This condition feels wrong to me. As I understand the code this should never be true when p->options.nocache is true. Or do I understand the code wrong?
http://gerrit.openvpn.net/c/openvpn/+/523/comment/67ae3287_17906ea3 :
PS1, Line 278: p->options.auth_file,
I think you messed up a rebase on top of a634cc5eccd55f1d14197da7376bb819bdf72cb6 here. Your code ignores auth_file_up again.
http://gerrit.openvpn.net/c/openvpn/+/523/comment/3303fbc3_b1eee104 :
PS1, Line 546: get_user_pass_http(p);
So previously this forced a reset of the credentials. This you removed. Are you sure this is correct? If yes, why?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Fri, 16 Feb 2024 16:01:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#2).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Previously, the caching of proxy credentials was not working due to the missing of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
This issue has been solved by getting the c->first_time parameter that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http() otherwise on SIGUSR1 or SIGHUP at the restart of the context instance credentials would be erase.
The nocache option has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
6 files changed, 39 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/2
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +4 -0
@@ -3123,6 +3123,10 @@if (ce->proto ==PROTO_TCP ) { ce->proto =PROTO_TCP_CLIENT ; +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } } }
src/openvpn/proxy.c +17 -2
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,6 +288,16 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; + p->queried_creds = true; + p->up = static_proxy_user_pass; + } + +/* +* Using cached credentials +*/ +else if (!static_proxy_user_pass.nocache) + { p->queried_creds = true; p->up = static_proxy_user_pass; }
@@ -542,7 +552,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -553,6 +563,7 @@#endif p->defined = true; + p->options.nocache = o->nocache;return p; }
@@ -656,6 +667,10 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 2:
(4 comments)
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/2fba2993_384c818e :
PS1, Line 1861: SHOW_BOOL(ce.http_proxy_options->nocache);
Quoted 1 line
This belongs into
show_connection_entrylike the othero->ceoptions
Acknowledged
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/0fc15362_dde1eff3 :
PS1, Line 275: if (!static_proxy_user_pass.defined || (is_first_time && !p->options.nocache) )
Quoted 1 line
This condition feels wrong to me. […]
Acknowledged
http://gerrit.openvpn.net/c/openvpn/+/523/comment/eda88547_5919fdf8 :
PS1, Line 278: p->options.auth_file,
Quoted 1 line
I think you messed up a rebase on top of
a634cc5eccd55f1d14197da7376bb819bdf72cb6here. […]
Acknowledged
http://gerrit.openvpn.net/c/openvpn/+/523/comment/607aa2a9_08aea895 :
PS1, Line 546: get_user_pass_http(p);
Quoted 1 line
So previously this forced a reset of the credentials. This you removed. […]
Acknowledged
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 26 Feb 2024 18:29:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#3).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
6 files changed, 39 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/3
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +4 -0
@@ -3123,6 +3123,10 @@if (ce->proto ==PROTO_TCP ) { ce->proto =PROTO_TCP_CLIENT ; +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } } }
src/openvpn/proxy.c +17 -2
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,6 +288,16 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; + p->queried_creds = true; + p->up = static_proxy_user_pass; + } + +/* +* Using cached credentials +*/ +else if (!static_proxy_user_pass.nocache) + { p->queried_creds = true; p->up = static_proxy_user_pass; }
@@ -542,7 +552,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -553,6 +563,7 @@#endif p->defined = true; + p->options.nocache = o->nocache;return p; }
@@ -656,6 +667,10 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 3: -Code-Review
(1 comment)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/e27428fc_b097b77f :
PS3, Line 555: get_user_pass_http(p, p->options.first_time);get_user_pass_http uses p->options.nocache but that is only set below. Is that intentional?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Tue, 27 Feb 2024 13:24:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 3:
(1 comment)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/07dbbffd_a306e8c1 :
PS3, Line 555: get_user_pass_http(p, p->options.first_time);
Quoted 1 line
get_user_pass_httpusesp->options.nocachebut that is only set below. […]
@[email protected]..., not at all, actually the p->options are setted little bit before the get_user_pass_http() through p->options = *o, so setting it below is something useless that I left during the last clean-up.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 27 Feb 2024 13:54:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#4).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
6 files changed, 38 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/4
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +4 -0
@@ -3123,6 +3123,10 @@if (ce->proto ==PROTO_TCP ) { ce->proto =PROTO_TCP_CLIENT ; +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } } }
src/openvpn/proxy.c +16 -2
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,6 +288,16 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; + p->queried_creds = true; + p->up = static_proxy_user_pass; + } + +/* +* Using cached credentials +*/ +else if (!static_proxy_user_pass.nocache) + { p->queried_creds = true; p->up = static_proxy_user_pass; }
@@ -542,7 +552,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +666,10 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 5: Code-Review-2
(1 comment)
Patchset:
PS5:
Tried to test this change but my tests failed to produce the desired behavior. Should figure out the problem before merging.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Mon, 11 Mar 2024 12:29:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 5:
(4 comments)
Commit Message:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/0095e7d0_7032f979 :
PS5, Line 21: http_proxy_options and also a getter method to retrieve
The man page for --auth-nocache still says it has no effect on --http-proxy. This needs to be updated.
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/10c5ad5e_1e39dee3 :
PS5, Line 3126: if (ce->http_proxy_options)
This needs to be moved one level up. E.g. when using "--proto tcp4-client" currently --auth-nocache is ignored, since proto is already PROTO_TCP_CLIENT. There should be no issue with always setting this independently of ce->proto.
File src/openvpn/proxy.h:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/2c3993c2_e1173cce :
PS5, Line 61: bool nocache;
Please update "show_http_proxy_options" in options.c to show value of nocache.
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/663d790d_11843add :
PS5, Line 669: if (p->up.nocache)
wouldn't it be better to move this clearing into get_user_pass_http?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Mon, 11 Mar 2024 14:45:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 5:
(4 comments)
Commit Message:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/87905ca4_736be2e0 :
PS5, Line 21: http_proxy_options and also a getter method to retrieve
Quoted 1 line
The man page for --auth-nocache still says it has no effect on --http-proxy. […]
Done
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/3b08b487_e3fc606d :
PS5, Line 3126: if (ce->http_proxy_options)
Quoted 1 line
This needs to be moved one level up. E.g. […]
Done
File src/openvpn/proxy.h:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/0c4157a3_109dd1dc :
PS5, Line 61: bool nocache;
Quoted 1 line
Please update "
show_http_proxy_options" inoptions.cto show value of nocache.
Done
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/f7da0dee_13ae81ae :
PS5, Line 669: if (p->up.nocache)
Quoted 1 line
wouldn't it be better to move this clearing into
get_user_pass_http?
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 08:36:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#6).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 40 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/6
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +16 -9
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,23 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; p->queried_creds = true; p->up = static_proxy_user_pass; } + +/* +* Using cached credentials +*/ +else if (!static_proxy_user_pass.nocache) + { + p->queried_creds = true; + p->up = static_proxy_user_pass; + } +else if (static_proxy_user_pass.nocache && !force) + { +clear_user_pass_http (); + } }#if 0
@@ -542,7 +556,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -1031,13 +1045,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 6: Code-Review-2
(2 comments)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/5c0d5864_4b0d142a :
PS6, Line 299: else if (!static_proxy_user_pass.nocache)
Do not actually need to check for nocache here. Since it will never be defined when nocache is set. So the check is redundant. You can even remove the else completely then and just always use static_proxy_user_pass at this point in the function.
http://gerrit.openvpn.net/c/openvpn/+/523/comment/b8aa24f7_cae22dbf :
PS6, Line 304: else if (static_proxy_user_pass.nocache && !force)
I think this condition is too complicated. What does this have to do with force? Also why the "else"? Just always delete it when nocache is true... Or am I missing something?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 11:04:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 6:
(2 comments)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/42ea2ef6_c71a07f0 :
PS6, Line 299: else if (!static_proxy_user_pass.nocache)
Quoted 1 line
Do not actually need to check for nocache here. Since it will never be defined when nocache is set. […]
Acknowledged
http://gerrit.openvpn.net/c/openvpn/+/523/comment/19fd5e77_9975a90f :
PS6, Line 304: else if (static_proxy_user_pass.nocache && !force)
Quoted 1 line
I think this condition is too complicated. […]
I think we need it otherwise in case of nocache true creds would be wiped at the first call of the get_user_pass() and then asked again at the second call (the one with force == false), by checking force we know that we're at the second call of the function so we can clear previous creds since we don't need them anymore. Totally agree about the "else".
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 11:27:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 6:
(1 comment)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/a8be4b5f_3cc2fa9a :
PS6, Line 304: else if (static_proxy_user_pass.nocache && !force)
Quoted 1 line
I think we need it otherwise in case of nocache true creds would be wiped at the first call of the g […]
You're right about the force. I didn't really think about the fact that when you don't use "auto" get_user_pass_http is going to be always called twice. But that also invalidates my other suggestion about the "else". The test for force is not enough since on restart force will be false for the first call. And it that case we should not clear it. I think we should go back to the previous iteration in this case. Move it out of the function again after the second get_user_pass_http. We really only want to delete it there after all.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 6
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 12:38:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: its_Giaan <[email protected]...>
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#7).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 38 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/7
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -9
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,16 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; p->queried_creds = true; p->up = static_proxy_user_pass; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +549,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +663,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1031,13 +1043,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 7:
(1 comment)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/00ff12bf_f5ff24b0 :
PS6, Line 304: else if (static_proxy_user_pass.nocache && !force)
Quoted 1 line
You're right about the force. […]
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 13:08:53 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: its_Giaan <[email protected]...>
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 7: Code-Review-1
(2 comments)
Patchset:
PS7:
almost there...
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/0285cd49_4660ab6b :
PS7, Line 293: p->up = static_proxy_user_pass;
These two lines are redundant now. Please remove them.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 13:36:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 7:
(1 comment)
File src/openvpn/proxy.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/07861da3_4c72dba0 :
PS7, Line 293: p->up = static_proxy_user_pass;
Quoted 1 line
These two lines are redundant now. Please remove them.
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 7
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 13:43:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#8).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 38 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/8
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1031,13 +1041,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 8
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 8: Code-Review+2
(1 comment)
Patchset:
PS8:
Tested with "stdin ntlm" and "auto" against the community NTLM proxy. With and without --auth-nocache.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 8
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Tue, 12 Mar 2024 16:36:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v8 1/1 Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/523
This mail reflects revision 8 of this Change.
Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -697,6 +697,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1031,13 +1041,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache () +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: its_Giaan, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 8: Code-Review-1
(3 comments)
Patchset:
PS8:
Minor nitpick: function call and prototype having empty brackets () instead of proper (void). This needs to be fixed, and I can't do code changes on merge.
File src/openvpn/ssl.h:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/5680c4c5_ce81e31d :
PS8, Line 402: bool ssl_get_auth_nocache();
this needs to have a (void) there.
File src/openvpn/ssl.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/7c301b9f_a12ccb3f :
PS8, Line 341: ssl_get_auth_nocache()
this needs to have a (void) there.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 8
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Wed, 19 Jun 2024 10:17:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, its_Giaan, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#9).
The following approvals got outdated and were removed:
Code-Review+2 by flichtenheld, Code-Review-1 by cron2
The change is no longer submittable: Code-Review and checks~ChecksSubmitRule are unsatisfied now.
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
6 files changed, 38 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/9
src/openvpn/init.c +2 -0
@@ -691,6 +691,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +4 -0
@@ -3121,6 +3121,10 @@if (ce->proto ==PROTO_TCP ) { ce->proto =PROTO_TCP_CLIENT ; +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } } }
src/openvpn/proxy.c +16 -2
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,6 +288,16 @@ auth_file,UP_TYPE_PROXY , flags); + static_proxy_user_pass.nocache = p->options.nocache; + p->queried_creds = true; + p->up = static_proxy_user_pass; + } + +/* +* Using cached credentials +*/ +else if (!static_proxy_user_pass.nocache) + { p->queried_creds = true; p->up = static_proxy_user_pass; }
@@ -542,7 +552,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +666,10 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache (void ) +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (void ); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 9
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [S] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, plaisthos.
its_Giaan has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 9:
(2 comments)
File src/openvpn/ssl.h:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/7670fb94_a3d3d05d :
PS8, Line 402: bool ssl_get_auth_nocache();
Quoted 1 line
this needs to have a
(void)there.
Done
File src/openvpn/ssl.c:
http://gerrit.openvpn.net/c/openvpn/+/523/comment/31872d63_557ff8df :
PS8, Line 341: ssl_get_auth_nocache()
Quoted 1 line
this needs to have a
(void)there.
Done
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 9
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 19 Jun 2024 11:59:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: cron2 <[email protected]...>
Gerrit-MessageType: comment
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
to look at the new patch set (#10).
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 38 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/10
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -691,6 +691,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1036,13 +1046,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache (void ) +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (void ); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 10
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveAttention is currently required from: flichtenheld, its_Giaan, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Patch Set 10: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 10
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Sun, 23 Jun 2024 20:05:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v10 1/1 Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/523
This mail reflects revision 10 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -691,6 +691,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1036,13 +1046,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache (void ) +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (void ); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
[Openvpn-devel] [PATCH applied] Re: Http-proxy: fix bug preventing proxy credentials caching
The original ACK came from Frank, I'm just ACKing the change v8 -> v10 (rebased, and add (void) to function declaration / prototypes where missing).
I do not have a test setup to properly test this right now - I do have proxies, but they do not need auth, and especially the "cache on reconnect" needs a different client-side driving framework to verify client behaviour (volunteers for a t_client.sh-alike using the management interface?). But I am told that Frank and Gianmarco have tested this very extensively, and it does not break any of the things I *can* test (basic auth-user-pass and token). So in it goes :-)
Your patch has been applied to the master and release/2.6 branch (bugfix).
commit 3cfd6f961d5c92bec283ac3616e1633b4e16760c (master) commit ad0c2c078ea505436b19255ebfbc8365044c5953 (release/2.6)
Author: Gianmarco De Gregori Date: Sun Jun 23 22:05:51 2024 +0200
Http-proxy: fix bug preventing proxy credentials caching
Signed-off-by: Gianmarco De Gregori <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28835.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archivecron2 has uploaded a new patch set (#11) to the change originally created by its_Giaan. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28835.html
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 38 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/23/523/11
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -691,6 +691,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1036,13 +1046,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache (void ) +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (void ); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 11
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
[Openvpn-devel] [M] Change in openvpn[master]: Http-proxy: fix bug preventing proxy credentials caching
In reply to a message not in the archivecron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/523?usp=email )
Change subject: Http-proxy: fix bug preventing proxy credentials caching
......................................................................
Http-proxy: fix bug preventing proxy credentials caching
Caching proxy credentials was not working due to the lack of handling already defined creds in get_user_pass(), which prevented the caching from working properly.
Fix this issue by getting the value of c->first_time, that indicates if we're at the first iteration of the main loop and use it as second argument of the get_user_pass_http(). Otherwise, on SIGUSR1 or SIGHUP upon instance context restart credentials would be erased every time.
The nocache member has been added to the struct http_proxy_options and also a getter method to retrieve that option from ssl has been added, by doing this we're able to erase previous queried user credentials to ensure correct operation.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28835.html
---
M doc/man-sections/generic-options.rst
M src/openvpn/init.c
M src/openvpn/options.c
M src/openvpn/proxy.c
M src/openvpn/proxy.h
M src/openvpn/ssl.c
M src/openvpn/ssl.h
7 files changed, 38 insertions(+), 14 deletions(-)
doc/man-sections/generic-options.rst +0 -3
@@ -19,9 +19,6 @@ When using ``--auth-nocache`` in combination with a user/password file and ``--chroot`` or ``--daemon``, make sure to use an absolute path. - This directive does not affect the ``--http-proxy`` username/password. - It is always cached. - --cd dir Change directory to ``dir`` prior to reading any files such as configuration files, key files, scripts, etc. ``dir`` should be an
src/openvpn/init.c +2 -0
@@ -691,6 +691,8 @@if (c->options.ce.http_proxy_options) { + c->options.ce.http_proxy_options->first_time = c->first_time; +/* Possible HTTP proxy user/pass input */ c->c1.http_proxy =http_proxy_new (c->options.ce.http_proxy_options);if (c->c1.http_proxy)
src/openvpn/options.c +6 -0
@@ -1650,6 +1650,7 @@SHOW_STR (auth_file);SHOW_STR (auth_file_up);SHOW_BOOL (inline_creds); +SHOW_BOOL (nocache);SHOW_STR (http_version);SHOW_STR (user_agent);for (i =0 ; i <MAX_CUSTOM_HTTP_HEADER && o->custom_headers[i].name; i++)
@@ -3151,6 +3152,11 @@ ce->flags |=CE_DISABLED ; } +if (ce->http_proxy_options) + { + ce->http_proxy_options->nocache =ssl_get_auth_nocache (); + } +/* our socks code is not fully IPv6 enabled yet (TCP works, UDP not) * so fall back to IPv4-only (trac #1221) */
src/openvpn/proxy.c +14 -11
@@ -276,7 +276,7 @@ { auth_file = p->options.auth_file_up; } -if (p->queried_creds) +if (p->queried_creds && !static_proxy_user_pass.nocache) { flags |=GET_USER_PASS_PREVIOUS_CREDS_FAILED ; }
@@ -288,9 +288,14 @@ auth_file,UP_TYPE_PROXY , flags); - p->queried_creds = true; - p->up = static_proxy_user_pass; + static_proxy_user_pass.nocache = p->options.nocache; } + +/* +* Using cached credentials +*/ + p->queried_creds = true; + p->up = static_proxy_user_pass; }#if 0
@@ -542,7 +547,7 @@* we know whether we need any. */ if (p->auth_method ==HTTP_AUTH_BASIC || p->auth_method ==HTTP_AUTH_NTLM2 ) { -get_user_pass_http (p, true); +get_user_pass_http (p, p->options.first_time); }#if !NTLM
@@ -656,6 +661,11 @@ || p->auth_method == HTTP_AUTH_NTLM2) {get_user_pass_http (p, false); + +if (p->up.nocache) + { +clear_user_pass_http (); + } }/* are we being called again after getting the digest server nonce in the previous transaction? */
@@ -1036,13 +1046,6 @@ } goto error; } - -/* clear state */ -if (p->options.auth_retry) - { -clear_user_pass_http (); - } -store_proxy_authenticate (p,NULL ); }/* check return code, success = 200 */
src/openvpn/proxy.h +2 -0
@@ -57,6 +57,8 @@const char *user_agent;struct http_custom_header custom_headers[MAX_CUSTOM_HTTP_HEADER ];bool inline_creds;/* auth_file_up is inline credentials */ +bool first_time;/* indicates if we need to wipe user creds at the first iteration of the main loop */ +bool nocache; };struct http_proxy_options_simple {
src/openvpn/ssl.c +9 -0
@@ -335,6 +335,15 @@ }/* +* Get the password caching +*/ +bool +ssl_get_auth_nocache (void ) +{ +return passbuf.nocache; +} + +/* * Set an authentication token */ void
src/openvpn/ssl.h +5 -0
@@ -397,6 +397,11 @@void ssl_set_auth_nocache (void );/* +* Getter method for retrieving the auth-nocache option. +*/ +bool ssl_get_auth_nocache (void ); + +/* * Purge any stored authentication information, both for key files and tunnel * authentication. If PCKS #11 is enabled, purge authentication for that too. * Note that auth_token is not cleared.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/523?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia3e06c0832c4ca0ab868c845279fb71c01a1a78a
Gerrit-Change-Number: 523
Gerrit-PatchSet: 11
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged